Fix direction of steppers in inverted scrollbars. (#129084, Olexiy

Fri Dec 12 00:05:31 2003  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkrange.c (gtk_range_scroll): Fix direction of
	steppers in inverted scrollbars.  (#129084, Olexiy Avramchenko)

diff --git a/ChangeLog b/ChangeLog
index cbab3b1dd52f31549bb75a2cc49056b8424a963f..c2f55eb0a75e0b4333efe255be9745762a9c308a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 12 00:05:31 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkrange.c (gtk_range_scroll): Fix direction of 
+       steppers in inverted scrollbars.  (#129084, Olexiy Avramchenko)
+
 Thu Dec 11 23:50:30 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtknotebook.c (gtk_notebook_pages_allocate): Don't 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cbab3b1dd52f31549bb75a2cc49056b8424a963f..c2f55eb0a75e0b4333efe255be9745762a9c308a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Dec 12 00:05:31 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkrange.c (gtk_range_scroll): Fix direction of 
+       steppers in inverted scrollbars.  (#129084, Olexiy Avramchenko)
+
 Thu Dec 11 23:50:30 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtknotebook.c (gtk_notebook_pages_allocate): Don't 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index cbab3b1dd52f31549bb75a2cc49056b8424a963f..c2f55eb0a75e0b4333efe255be9745762a9c308a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Dec 12 00:05:31 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkrange.c (gtk_range_scroll): Fix direction of 
+       steppers in inverted scrollbars.  (#129084, Olexiy Avramchenko)
+
 Thu Dec 11 23:50:30 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtknotebook.c (gtk_notebook_pages_allocate): Don't 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index cbab3b1dd52f31549bb75a2cc49056b8424a963f..c2f55eb0a75e0b4333efe255be9745762a9c308a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Dec 12 00:05:31 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkrange.c (gtk_range_scroll): Fix direction of 
+       steppers in inverted scrollbars.  (#129084, Olexiy Avramchenko)
+
 Thu Dec 11 23:50:30 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtknotebook.c (gtk_notebook_pages_allocate): Don't 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cbab3b1dd52f31549bb75a2cc49056b8424a963f..c2f55eb0a75e0b4333efe255be9745762a9c308a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Dec 12 00:05:31 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkrange.c (gtk_range_scroll): Fix direction of 
+       steppers in inverted scrollbars.  (#129084, Olexiy Avramchenko)
+
 Thu Dec 11 23:50:30 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtknotebook.c (gtk_notebook_pages_allocate): Don't 

diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 61f29102b0eb2328ea5ca3971e0d852544babfde..a2ed95ca8c3f639ca9192f851e88178a271ee87a 100644 (file)
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -1529,7 +1529,6 @@ step_forward (GtkRange *range)
   gdouble newval;
 
   newval = range->adjustment->value + range->adjustment->step_increment;
-
   gtk_range_internal_set_value (range, newval);
 }
 
@@ -1549,7 +1548,21 @@ page_forward (GtkRange *range)
   gdouble newval;
 
   newval = range->adjustment->value + range->adjustment->page_increment;
+  gtk_range_internal_set_value (range, newval);
+}
+
+static void
+scroll_begin (GtkRange *range)
+{
+  gtk_range_internal_set_value (range, range->adjustment->lower);
+}
+
+static void
+scroll_end (GtkRange *range)
+{
+  gdouble newval;
 
+  newval = range->adjustment->upper - range->adjustment->page_size;
   gtk_range_internal_set_value (range, newval);
 }
 
@@ -1588,11 +1601,17 @@ gtk_range_scroll (GtkRange     *range,
       break;
                   
     case GTK_SCROLL_STEP_BACKWARD:
-      step_back (range);
+      if (should_invert (range))
+        step_forward (range);
+      else
+        step_back (range);
       break;
                   
     case GTK_SCROLL_STEP_FORWARD:
-      step_forward (range);
+      if (should_invert (range))
+        step_back (range);
+      else
+        step_forward (range);
       break;
 
     case GTK_SCROLL_PAGE_LEFT:
@@ -1624,21 +1643,31 @@ gtk_range_scroll (GtkRange     *range,
       break;
                   
     case GTK_SCROLL_PAGE_BACKWARD:
-      page_back (range);
+      if (should_invert (range))
+        page_forward (range);
+      else
+        page_back (range);
       break;
                   
     case GTK_SCROLL_PAGE_FORWARD:
-      page_forward (range);
+      if (should_invert (range))
+        page_back (range);
+      else
+        page_forward (range);
       break;
 
     case GTK_SCROLL_START:
-      gtk_range_internal_set_value (range,
-                                    range->adjustment->lower);
+      if (should_invert (range))
+       scroll_end (range);
+      else
+        scroll_begin (range);
       break;
 
     case GTK_SCROLL_END:
-      gtk_range_internal_set_value (range,
-                                    range->adjustment->upper - range->adjustment->page_size);
+      if (should_invert (range))
+        scroll_begin (range);
+      else
+       scroll_end (range);
       break;
 
     case GTK_SCROLL_JUMP: